Improve line filters and substitution filters #2032
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
# Conflicts: # Src/CompareEngines/Wrap_DiffUtils.cpp # Src/DiffWrapper.h
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
sdottaka
changed the title
| if (c == '\r') | ||
| { | ||
| if (i + 1 < lines.length() && lines[i + 1] == '\n') | ||
| i++; |
Check notice
Code scanning / CodeQL
For loop variable changed in body Note
This was referenced Sep 20, 2023
sdottaka
added a commit
that referenced
this pull request
Oct 1, 2023
sdottaka
added a commit
that referenced
this pull request
Oct 1, 2023
sdottaka
added a commit
that referenced
this pull request
Oct 1, 2023
sdottaka
added a commit
that referenced
this pull request
Oct 5, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Currently, when a diff hunk contains both line filtered lines and unfiltered lines, as shown below, the differences between the filtered lines in the diff hunk were not ignored.
This PR improves the differences between the filtered lines to be ignored as follows: